Avoid spurious selection of RTL direction if the widget does not have

2005-02-04  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkentry.c (gtk_entry_create_layout): Avoid spurious
	selection of RTL direction if the widget does not have
	focus.  (#164125, Frederic Crozat)

diff --git a/ChangeLog b/ChangeLog
index 6121f6e1e0eeb81727ef2a200ac4632b24c4c19e..7aab1a26059b90f4e635dbeb062db391cdd3f136 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-04  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkentry.c (gtk_entry_create_layout): Avoid spurious
+       selection of RTL direction if the widget does not have 
+       focus.  (#164125, Frederic Crozat)
+
 Thu Feb  3 19:15:55 2005  Manish Singh  <yosh@gimp.org>
 
        * gdk/x11/gdkdrawable-x11.c: #include cairo-xlib.h

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6121f6e1e0eeb81727ef2a200ac4632b24c4c19e..7aab1a26059b90f4e635dbeb062db391cdd3f136 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-02-04  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkentry.c (gtk_entry_create_layout): Avoid spurious
+       selection of RTL direction if the widget does not have 
+       focus.  (#164125, Frederic Crozat)
+
 Thu Feb  3 19:15:55 2005  Manish Singh  <yosh@gimp.org>
 
        * gdk/x11/gdkdrawable-x11.c: #include cairo-xlib.h

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6121f6e1e0eeb81727ef2a200ac4632b24c4c19e..7aab1a26059b90f4e635dbeb062db391cdd3f136 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2005-02-04  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkentry.c (gtk_entry_create_layout): Avoid spurious
+       selection of RTL direction if the widget does not have 
+       focus.  (#164125, Frederic Crozat)
+
 Thu Feb  3 19:15:55 2005  Manish Singh  <yosh@gimp.org>
 
        * gdk/x11/gdkdrawable-x11.c: #include cairo-xlib.h

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 7a81353c82640488c8284eeeb74209c7b86a0e8f..fbe019f6b1e4f3b5417f2d71e3afcc3cfa7f3db6 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -2968,7 +2968,10 @@ gtk_entry_create_layout (GtkEntry *entry,
            {
              GdkDisplay *display = gtk_widget_get_display (widget);
              GdkKeymap *keymap = gdk_keymap_get_for_display (display);
-             pango_dir = gdk_keymap_get_direction (keymap);
+             if (gdk_keymap_get_direction (keymap) == PANGO_DIRECTION_RTL)
+               pango_dir = PANGO_DIRECTION_RTL;
+             else
+               pango_dir = PANGO_DIRECTION_LTR;
            }
           else
            {